#!/usr/bin/env bash

DIR_NAME_01=test
rm -r -f ${DIR_NAME_01}
mkdir ${DIR_NAME_01}
cd ${DIR_NAME_01}
git init

cp -f ../../111.txt 111.txt
git add 111.txt
git commit -m "master：add 111.txt"

git branch AAA
git checkout AAA
cp -f ../../111-modify-by-AAA.txt 111.txt
git add 111.txt
git commit -m "AAA：modify 111.txt"

git checkout master
cp -f ../../111-modify-by-master.txt 111.txt
git add 111.txt
git commit -m "master：modify 111.txt"

git checkout master
git merge AAA
### expect:
### master:111.txt conflict!

